From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 5 Apr 2006 19:54:42 +0000 (+0000)
Subject: Fix big huge PHP warning error on every page when allow_call_time_pass_reference... 
X-Git-Tag: 1.31.0-rc.0~57564
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=24399f31759ba31fa3935beac918accefd223793;p=lhc%2Fweb%2Fwiklou.git

Fix big huge PHP warning error on every page when allow_call_time_pass_reference is off
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 632b251c30..1775eaddd7 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2613,8 +2613,7 @@ class Parser
 			if ( $colonPos !== false ) {
 				$function = strtolower( substr( $part1, 0, $colonPos ) );
 				if ( isset( $this->mFunctionHooks[$function] ) ) {
-					$funcArgs = $args;
-					array_unshift( $funcArgs, &$this, substr( $part1, $colonPos + 1 ) );
+					$funcArgs = array_merge( array( &$this, substr( $part1, $colonPos + 1 ) ), $args );
 					$result = call_user_func_array( $this->mFunctionHooks[$function], $funcArgs );
 					$found = true;
 					if ( is_array( $result ) ) {